Autogenerated HTML docs for v1.6.5-rc3-35-g3340
diff --git a/git-merge.html b/git-merge.html index 080a08a..ece98e6 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -491,9 +491,10 @@ </dt> <dd> <p> - The commit message to be used for the merge commit (in case - it is created). The <em>git-fmt-merge-msg</em> script can be used - to give a good default for automated <em>git-merge</em> invocations. + Set the commit message to be used for the merge commit (in + case one is created). The <em>git fmt-merge-msg</em> command can be + used to give a good default for automated <em>git merge</em> + invocations. </p> </dd> <dt> @@ -684,8 +685,8 @@ <dd> <p> Sets default options for merging into branch <name>. The syntax and - supported options are equal to that of <em>git-merge</em>, but option values - containing whitespace characters are currently not supported. + supported options are the same as those of <em>git merge</em>, but option + values containing whitespace characters are currently not supported. </p> </dd> </dl></div> @@ -922,7 +923,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-08-13 01:22:25 UTC +Last updated 2009-10-10 00:56:05 UTC </div> </div> </body>
